Fix a C99ism, spotted by Crispin Flowerday.

2005-12-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilesystemunix.c (cb_fill_in_mime_type): Fix a C99ism,
	spotted by Crispin Flowerday.

diff --git a/ChangeLog b/ChangeLog
index da1cae60778b3828a8c904771b132e8a9e005351..fe7198919f1ff625bc032b490431025096917dd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilesystemunix.c (cb_fill_in_mime_type): Fix a C99ism,
+       spotted by Crispin Flowerday.
+
 2005-12-06  Behdad Esfahbod  <behdad@gnome.org>
 
        * gtk/gtksettings.c (settings_update_font_options): Turn metrics

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index da1cae60778b3828a8c904771b132e8a9e005351..fe7198919f1ff625bc032b490431025096917dd0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilesystemunix.c (cb_fill_in_mime_type): Fix a C99ism,
+       spotted by Crispin Flowerday.
+
 2005-12-06  Behdad Esfahbod  <behdad@gnome.org>
 
        * gtk/gtksettings.c (settings_update_font_options): Turn metrics

diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index ccc541a3a263b81f941c6eca90dee5f33cf17c73..5f078190ddbb71eead60b45b4cf0333c8be0fa09 100644 (file)
--- a/gtk/gtkfilesystemunix.c
+++ b/gtk/gtkfilesystemunix.c
@@ -2154,15 +2154,16 @@ cb_fill_in_mime_type (gpointer key, gpointer value, gpointer user_data)
   GtkFileFolderUnix *folder_unix = user_data;
   char *fullname = g_build_filename (folder_unix->filename, basename, NULL);
   struct stat *statbuf = NULL;
+  const char *mime_type;
 
   if (folder_unix->have_stat)
     statbuf = &entry->statbuf;
 
-  const char *mime_type = xdg_mime_get_mime_type_for_file (fullname, statbuf);
+  mime_type = xdg_mime_get_mime_type_for_file (fullname, statbuf);
   entry->mime_type = g_strdup (mime_type);
 
   g_free (fullname);
-  /* FIXME: free on NULL?  */
+
   return FALSE;
 }